Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 10 Feb 2010 14:06:11 +0000 (14:06 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 10 Feb 2010 14:06:11 +0000 (14:06 +0000)

Trivial merge